[automerger skipped] Merge "NBMController should load DDC data on creation"...

[automerger skipped] Merge "NBMController should load DDC data on creation" into udc-d1-dev am: 7cc801a8 -s ours am: 0aa176c0 -s ours am: d76b7f7d -s ours

am skip reason: Merged-In I16a31665d963ab0917c4f7be173134b37e0613e7 with SHA-1 1f04a112 is already in history

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



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