[automerger skipped] Merge "[RESTRICT AUTOMERGE] Disable...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Disable NOTIFICATION_INLINE_REPLY_ANIMATION flag" into tm-qpr-dev am: 2e9e6002 -s ours am: 5a145e84 -s ours am: 1ebfd4d7 -s ours am: dcfff6cf -s ours am: ad2c6d6f -s ours

am skip reason: subject contains skip directive

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



Change-Id: Ib99c9e455a9e070d9cc9af96a6132cf9a2b8d65c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>