[automerger skipped] [RESTRICT AUTOMERGE] Null is a valid volume uuid. am: 3fae7a0c6a -s ours am: b36856f81a -s ours am: 7fe62578b3 -s ours am: a43cf11af1 -s ours

am skip reason: subject contains skip directive

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

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