Merge changes from topic "tow-2-rollback-no-flag" into udc-d1-dev am: fd60f60c

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



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