Merge "Turn off app close flag, Revert back to R implementation." into sc-dev am: d8035e1821

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14750661

Change-Id: I5693fe3eb837e0383201e992677fd5cc4a681dc7