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