Merge changes from topics "downloadable_init_change_1", "downloadable_init_change_2" am: f2193be3f0 am: 7556b81f80

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I16864675dc1a3bfa6b257bf5ba52ea3fe2f86658