[AppCompat] - backport changes from N - reworked

Took into account and actioned the comments from the
previous CL.

Bug: 34118882
Test: existing tests pass
Change-Id: I154ccc39cbbed7b4621346df6ac480016576cfe3
11 files changed