[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: Ia8a7bb762dbd03978438a9ca258980d2180d0b11