Merge "Merge "Also parse integer, long and boolean extras for NFC" into tm-dev...

Merge "Merge "Also parse integer, long and boolean extras for NFC" into tm-dev am: 79e7d4b5 am: abdc4f1e am: 51c1c144" into tm-qpr-dev-plus-aosp am: 7a09edcb

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



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