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: I8bfeaa56b988567615eafcb8b8d912ae2e1c570f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>