[automerger skipped] Merge "DO NOT MERGE Do not reinflate the layout if it has...

[automerger skipped] Merge "DO NOT MERGE Do not reinflate the layout if it has not been already inflated." into rvc-qpr-dev am: ed260d83 am: 57cefc36 -s ours am: c7677faf -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: I9295e06ccff98688712884e95ac0ab7159b16599