Merge "Merge "Only add boolean extra to bundle when the value is false" into...

Merge "Merge "Only add boolean extra to bundle when the value is false" into tm-dev am: 76f37a5d am: 06a00ac6" into tm-d1-dev-plus-aosp am: e5bf6c03

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



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