Merge "Revert "Remove getSfInstance usage from ViewRootImpl"" into tm-dev am: cf168898

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



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