Merge "Never instatiate App class multiple times" into tm-dev am: ff23fb2fab

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

Change-Id: I5b485de99881cede11dfccd025811781ea00d6fc