Merge "Don't update the genID for an immutable bitmap" into rvc-dev am: 10dd5e9a18 am: e9f550649f am: 33815daea6

Change-Id: Idc17a498b587a9fcd4b6c2cfb967cf0a71774d29