Merge "Fix incorrect message being sent for all intents." into tm-qpr-dev am: 1693f176

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



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