Merge cherrypicks of ['googleplex-android-review.googlesource.com/24370183'] into udc-release. am: 34b0353df3 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Traceur/+/24506120 Change-Id: I39b9d99e1130d850bb03551767cf92ef4b0f2bfb Signed-off-by: Automerger Merge Worker <[email protected]>