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

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

Change-Id: I5d81c2584da40d10faf4f481ea867772900ce827