Merge changes from topic "Sync-fix-redo" into tm-dev am: a501fcb7 am: ddff2d41 am: 1efa4555

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



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