[automerger skipped] Merge "resolve merge conflicts of 5134b8aa to sc-v2-dev  [DO NOT MERGE]" into sc-v2-dev am: bbff94cf am: bb0b3ce3 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I499d7626f08c2b49d550a656aa0615c8c393d47d