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

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

Change-Id: I00af89437af6a23552e7ce6070ca8250e3860b8f