[automerger skipped] Populate buckets to ensure correct corner rounds on...

[automerger skipped] Populate buckets to ensure correct corner rounds on notifications am: 4ddf9d09 am: b6f9caac -s ours

am skip reason: Merged-In I36f6f2ac2a503daa01594248a1e6cffcfbd5c348 with SHA-1 1301096f is already in history

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

Change-Id: If02713fe9b6987f607a9325f4ba25eea429560c0