[automerger skipped] Merge "[DO NOT MERGE] Fix unexpectedly NPE on CF when...

[automerger skipped] Merge "[DO NOT MERGE] Fix unexpectedly NPE on CF when calling mDevice.getProductName()" into sc-v2-dev am: 5581402d am: 82c632df -s ours

am skip reason: subject contains skip directive

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

Change-Id: I4a4e947032c2d5df66d8e87120962b5fe1070182