[automerger skipped] Add to/from disk stable format am: 1e3c0ae6 am: 1f2df484 am: c6bb2bc3 -s ours

am skip reason: Merged-In Ifafb7081ec6a34ce3ab8e2aa502d46411405cb6d with SHA-1 1e3c0ae6 is already in history

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



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