Merge "Remove complicated previousAppId usage" am: f0ea70ec am: 7771fa27...

Merge "Remove complicated previousAppId usage" am: f0ea70ec am: 7771fa27 am: d85390a5 am: 5fe67d40 am: ab706832

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2016416



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