Merge "Update style drawables after bugbash" into rvc-d1-dev am: 2129ea98 am: 8fc024ee am: e273403d

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

Change-Id: Ie2bc31014e6f0e0ae588eb4ec01be6bce9482ed3