[automerger skipped] [automerge] DO NOT MERGE Listen for config changes when...

[automerger skipped] [automerge] DO NOT MERGE Listen for config changes when updating features. 2p: 6c39d4fb am: 09d12332 -s ours am: 787d207f -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6695f5a22d2b2a99cf168a6994268197b8e172b4