Merge "Fix stack height jump during lockscreen=>shade and aod<=>ls" into tm-dev am: c5b165e8

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17872584



Change-Id: I98d9741c34871f12b1549e66abd3f929f1cfa181
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>