Merge "Revert "Remove all appId migration related public APIs"" into tm-dev am: 2ea87d4d90

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17372475

Change-Id: I9ed7defc3195b8019b3e0c1f587ea2f7facdb29f