Merge "Fix stack height jump during lockscreen=>shade and aod<=>ls" into tm-dev am: c5b165e8a5 am: 726f5f323a am: 7097029e74 am: a3dc7faf64
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17872584 Change-Id: I0aba4455bedffa5f78ff90858ba0502f80a1b8f0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: