Merge "Triskaidekaphilia intensifies." into tm-dev am: 1806b003 am: 80440b81

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



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