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

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

Change-Id: I301da73c936055e28b975ce158b494c558871734