[automerger skipped] NBMController should load DDC data on creation am: 72524ce860 -s ours am: 531b5bf50c -s ours am: b94099d282 -s ours
am skip reason: Merged-In I16a31665d963ab0917c4f7be173134b37e0613e7 with SHA-1 1f04a11225 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24128686
Change-Id: Ia1ab898f86b26713a21d77db168d55253fd85d6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: