Merge "[automerger skipped] Merge "Remove...

Merge "[automerger skipped] Merge "Remove Dependency.staticOnConfigurationChanged" into qt-qpr1-dev am: 97af8f1a -s ours am: b7d174fb -s ours am: db6dad42 -s ours am: 024c63a1 -s ours am: 04730848 -s ours am skip reason: Change-Id Id2c3fe5ae2729b181769fb31b8050da264299d72 with SHA-1 bba732de is in history" into rvc-qpr-dev-plus-aosp am: 0baab24b -s ours
am skip reason: Change-Id Id2c3fe5ae2729b181769fb31b8050da264299d72 with SHA-1 bba732de is in history

Change-Id: I006e557cfa9abcf49e6f94dbb383fbe4e77ea09f