Merge "Add @TestApi to ActivityManager.IMPORTANCE_CANT_SAVE_STATE_PRE_26."