Merge "Remove complicated previousAppId usage" am: f0ea70ec57 am: 7771fa2768

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

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