[automerger skipped] Merge changes from topics "downloadable_init_change_1",...

[automerger skipped] Merge changes from topics "downloadable_init_change_1", "downloadable_init_change_2" am: f2193be3 am: 7556b81f am: 06bca1be -s ours am: f11798a0 -s ours

am skip reason: Change-Id Ia8fd0ab98c33d1e30b4fce1bad53b1c628364725 with SHA-1 ff5672ff is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9d35ec38e939e254dcfafa3a35bbb97f755d8184