Merge tag 'android-security-15.0.0_r6' into staging/lineage-22.1_android-security-15.0.0_r6
Android Security 15.0.0 Release 6 (12895207)
* tag 'android-security-15.0.0_r6':
servicemanager: set consistent flags for self-reg
libbinder: fix build error in test
libbinder: Parcel: validate read data before write
libbinder: Parcel: grow rejects large data pos
binder: fix FD handling in continueWrite
Fix DisplayState sanitization.
Conflicts:
libs/binder/tests/binderLibTest.cpp
Change-Id: I15586077205e8067d9f5fc1176c3aac803ef02c7