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

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



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