[AppCompat] - backport changes from N

Bug: 34118882
Test: existing tests pass
Change-Id: Iaf3852ce6d6c3b2439fd421c09e8c69bafd520a6
12 files changed