Merge "Fix compat issue with apps directly calling LoadedApk.makeApplication()." into tm-dev am: 3403fc7f am: 13868acd

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

Change-Id: I6b7fb4299a9119de8b0e413d5942499d29379c8a