tree 20e7e6556f0a3b612d4ae73caeec54dc5c5d65ea
parent 4d01717c14fb6d43f26f6c39a804a03ff63a9114
parent b95361ab606877dc542e49bbeda8d80114d09ebd
author Raff Tsai <rafftsai@google.com> 1559179707 -0700
committer android-build-merger <android-build-merger@google.com> 1559179707 -0700

[automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-mr1-dev
am: b95361ab60 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 9fa8329b02 is in history

Change-Id: I66e6f4f24bd7349db363f28f0462d16825e544c8