tree 1973ce622ee15185997b1f6cb06bdb1fda6a909a
parent 521ef546d10f1ae60c009129efdb23867abcb752
parent 5406854a5f8b350c65ca5ef18db0852d4b3c4742
author Philip P. Moltmann <moltmann@google.com> 1560982831 -0700
committer android-build-merger <android-build-merger@google.com> 1560982831 -0700

Merge changes from topic "AlwaysKeepAppOpsSynced" into qt-dev am: bf5506b240
am: 5406854a5f

Change-Id: If4dd41e50371dd815559bfbc82a5c29da09565cb