Merge "Fixing possible NullPointerException" into udc-dev am: d45d287761 am: df59ce6c52
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21550086 Change-Id: I2a5df14c84b87bf450e64286b8540f78d94fca79 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: