Merge "Allows the hierarchy operations in lock-task mode" into tm-qpr-dev am:...

Merge "Allows the hierarchy operations in lock-task mode" into tm-qpr-dev am: 96f3ac3b am: 4b9d75e0

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



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