Merge "Initialize AppCompatCallbacks in system server" am: 2773409cac
am: 8579ddfb23

Change-Id: I7be68b5fa9c1bf9b95722b35b322845a966e565f