Merge "Handle tranlucent strategy on back" into tm-qpr-dev am: 0b5d2db6

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



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