[automerger skipped] [automerged blank] [RESTRICT AUTOMERGE] Null is a valid...

[automerger skipped] [automerged blank] [RESTRICT AUTOMERGE] Null is a valid volume uuid. 2p: 3fae7a0c 2p: 2dc278f6 am: bcf88d96 -s ours am: 30111d76 -s ours

am skip reason: Merged-In Ib2af1afc78b3d9c6d8eb534e5f536aae153eeeb0 with SHA-1 ec8328db is already in history

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



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