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

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



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