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

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

Change-Id: Ib23cdb441a28255d66f9c95d2c6de210a08acf01