Merge "Revert "Revert "Cherrypicking flags and override methods for all..."" am: 5c35d3bce6

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1845059

Change-Id: I90e8a4d567fe2de9ab765806fc7bd3aba4fe0845