Merge "Add FLAG_IMMUTABLE in DevTools app" am: 95e0aacc63 am: 40d5fb833c

Original change: https://android-review.googlesource.com/c/platform/development/+/2383492

Change-Id: I6ccb006501aebf516abd6490fd390abf7c4e9ded
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>