[manual merge] [automerger skipped] Merge all "next" commits that are blank

List generated from https://googleplex-android.googlesource.com/platform/frameworks/base/+log/udc-qpr-dev-plus-aosp..udc-d1-dev-plus-aosp?reverse&first-parent

Tree hash is the same on the upstream branch between cfc785b849e27944e56eee3e92b7c6364eef9f58 and da146dd2.

Change-Id: Ia83fb05587cd915ef20316d576f16b22da918c9b