Revert "[AppCompat] - backport changes from N"

This reverts commit e419aa4002976f2c79754b507dff8b14c007b277.

Change-Id: Ifcdfcd1d9be133da1e2e97c1b5d5e368fbfe4923
12 files changed