Merge "Remove scaffolding for multiple dots" into tm-qpr-dev am: 86ab34d0 am: c2d471ff

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



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