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

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



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