[automerger skipped] DO NOT MERGE Do not reinflate the layout if it has not been already inflated. am: b700beab66 am: 15780ebbc0 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13807481 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4c852a8883c62bb9d547cf0ae0ec7d834c03adca
This commit is contained in: