Merge "Reapply changes of inline reply CL" into tm-qpr-dev am: ccff5e14

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



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