Merge "Fix action mode animation on recreations - framework edition am: e65b3fbb63 am: 9269e2272b" into nyc-mr1-dev-plus-aosp
am: 8323f3057c
* commit '8323f3057ce0f8521e8abe15a9e86a42ae59849a':
Change-Id: I1d2daae766d1f1f64d0fb481908c820c5e7f2f9d
This commit is contained in: