Merge "Merge "Backport framework changes to AppCompat" into nyc-dev am: d1dc40293d am: 16cfb806ff" into nyc-mr1-dev-plus-aosp
am: 2ef82ccf7b

* commit '2ef82ccf7b08c6c8abf53da22db1795064d8e740':

Change-Id: I960b8e23862ad911755e5e1ed122a0721c74d907