[automerger skipped] DO NOT MERGE Do not reinflate the layout if it has not been already inflated. am: b700beab am: 15780ebb -s ours am: 92e92b6b -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: I52a83b721347423760874dfd7138a4a4fe7da25f